From 272e0b5b763a5deefe8138fb053fe72ef1ac0d4c Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 21 Oct 2009 18:25:02 +0200
Subject: [PATCH] Deprecated GtkNotebook tab packing

https://bugzilla.gnome.org/show_bug.cgi?id=596083
---
 docs/reference/gtk/tmpl/gtknotebook.sgml | 3 ++-
 gtk/gtk.symbols                          | 4 ++++
 gtk/gtknotebook.c                        | 4 ++++
 gtk/gtknotebook.h                        | 2 ++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index d7ca51081f..0dc90496af 100644
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -256,7 +256,8 @@ Emitted when the user or a function changes the current page.
 
 <!-- ##### ARG GtkNotebook:tab-pack ##### -->
 <para>
-
+ Deprecated: 2.20: The tab packing functionality of children should not
+ be used anymore and support will be removed in the future.
 </para>
 
 <!-- ##### ARG GtkNotebook:arrow-spacing ##### -->
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index a32855e5e4..8f19b5d5e4 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2634,7 +2634,9 @@ gtk_notebook_popup_enable
 gtk_notebook_prepend_page
 gtk_notebook_prepend_page_menu
 gtk_notebook_prev_page
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_notebook_query_tab_label_packing
+#endif
 gtk_notebook_remove_page
 gtk_notebook_reorder_child
 gtk_notebook_set_current_page
@@ -2650,7 +2652,9 @@ gtk_notebook_set_scrollable
 gtk_notebook_set_show_border
 gtk_notebook_set_show_tabs
 gtk_notebook_set_tab_label
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_notebook_set_tab_label_packing
+#endif
 gtk_notebook_set_tab_label_text
 gtk_notebook_set_tab_pos
 gtk_notebook_set_window_creation_hook
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 2c6a507a4c..e42e2fa7dc 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -7198,6 +7198,8 @@ gtk_notebook_child_reordered (GtkNotebook     *notebook,
  * Sets the packing parameters for the tab label of the page
  * containing @child. See gtk_box_pack_start() for the exact meaning
  * of the parameters.
+ *
+ * Deprecated: 2.20: Modify the "expand" and "fill" child properties instead.
  **/
 void
 gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
@@ -7249,6 +7251,8 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
  * 
  * Query the packing attributes for the tab label of the page
  * containing @child.
+ *
+ * Deprecated: 2.20: Modify the "expand" and "fill" child properties instead.
  **/
 void
 gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 0659cc92d2..41bbe66979 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -261,6 +261,7 @@ void gtk_notebook_set_menu_label_text     (GtkNotebook *notebook,
 					   const gchar *menu_text);
 G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
 							GtkWidget   *child);
+#ifndef GTK_DISABLE_DEPRECATED
 void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
 					   GtkWidget   *child,
 					   gboolean    *expand,
@@ -271,6 +272,7 @@ void gtk_notebook_set_tab_label_packing   (GtkNotebook *notebook,
 					   gboolean     expand,
 					   gboolean     fill,
 					   GtkPackType  pack_type);
+#endif
 void gtk_notebook_reorder_child           (GtkNotebook *notebook,
 					   GtkWidget   *child,
 					   gint         position);
-- 
2.30.2